Revision: bazaar--devel--1.1--patch-48
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Fri Dec 17 00:30:04 EST 2004
Standard-date: 2004-12-16 13:30:04 GMT
Modified-files: commands/lint.c commands/lint.h
    commands/missing.c commands/status.c
New-patches: jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--base-0
    jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--patch-1
    jblack@gnuarch.org--2004/baz--relint--1.1--base-0
    jblack@gnuarch.org--2004/baz--relint--1.1--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4706--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4706--0--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-48
    thelove@canonical.com/bazaar--devo--1.1--patch-56
    thelove@canonical.com/bazaar--devo--1.1--patch-57
    thelove@canonical.com/bazaar--devo--1.1--patch-58
    thelove@canonical.com/bazaar--devo--1.1--patch-59
    thelove@canonical.com/bazaar--devo--1.1--patch-60
    thelove@canonical.com/bazaar--devo--1.1--patch-61
Summary: merge from thelove@canonical.com/bazaar--devo--1.1
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-56

 * jblack@gnuarch.org--2004/baz--diffsnotdiff--1.1--patch-1
   Fix baz changes to use baz diff instead of diffs

 * jblack@gnuarch.org--2004/baz--relint--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-56

 * jblack@gnuarch.org--2004/baz--relint--1.1--patch-1
   Baz lint returned

 * rob.weir@canonical.com--2004-public/baz--bug4706--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-59

 * rob.weir@canonical.com--2004-public/baz--bug4706--0--patch-1
   Remove the --merges option from missing, since it does nothing (#4706).

 * thelove@canonical.com/bazaar--devo--1.1--patch-56
   merge from ds-arch@digital-scurf.org--laptop-2004/bazaar--devo--1.1 - fix .archive-version presence in .listing on ftp servers

 * thelove@canonical.com/bazaar--devo--1.1--patch-57
   Clearing up reject blocker on undo

 * thelove@canonical.com/bazaar--devo--1.1--patch-58
   Baz Lint readded (fixes 4655)

 * thelove@canonical.com/bazaar--devo--1.1--patch-59
   add welksh and spanish translations

 * thelove@canonical.com/bazaar--devo--1.1--patch-60
   update es translation

 * thelove@canonical.com/bazaar--devo--1.1--patch-61
   Remove the --merges option from missing, since it does nothing (#4706).

